Added exception handler for ProtocolError.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
index 58c0b63659540f8b8b352c7b71e5aa86a54fc433..d3cab934525dd984a3215e42cfb6d942addee40f 100644 (file)
--- a/tools/python/xen/xm/main.py
+++ b/tools/python/xen/xm/main.py
@@ -1102,6 +1102,12 @@ def main(argv=sys.argv):
             else:
                 err("Error connecting to xend: %s." % ex[1])
             sys.exit(1)
+        except xmlrpclib.ProtocolError, ex:
+            if os.geteuid() != 0:
+                err("Most commands need root access.  Please try again as root.")
+            else:
+                err("Error connecting to xend: %s." % ex.errmsg)
+            sys.exit(1)
         except SystemExit:
             sys.exit(1)
         except xmlrpclib.Fault, ex: